demos: Drop the '+' from GTK
authorEmmanuele Bassi <ebassi@gnome.org>
Tue, 5 Feb 2019 09:19:57 +0000 (10:19 +0100)
committerEmmanuele Bassi <ebassi@gnome.org>
Tue, 5 Feb 2019 09:19:57 +0000 (10:19 +0100)
The demos have user-visible text that should refer to "GTK", not "GTK+"
any more.

18 files changed:
demos/gtk-demo/application.c
demos/gtk-demo/changedisplay.c
demos/gtk-demo/colorsel.c
demos/gtk-demo/foreigndrawing.c
demos/gtk-demo/images.c
demos/gtk-demo/listbox.c
demos/gtk-demo/main.c
demos/gtk-demo/main.ui
demos/gtk-demo/org.gtk.Demo.appdata.xml
demos/gtk-demo/org.gtk.Demo.desktop
demos/gtk-demo/rotated_text.c
demos/gtk-demo/sidebar.c
demos/gtk-demo/textview.c
demos/gtk-demo/theming_style_classes.c
demos/widget-factory/org.gtk.WidgetFactory.appdata.xml
demos/widget-factory/org.gtk.WidgetFactory.desktop
demos/widget-factory/widget-factory.c
demos/widget-factory/widget-factory.ui

index 02352c1105659699357d8d46e8cdd9e8cf19c25e..767e351d96dc3e8e3b495eb3ff8b4d8f4629b005 100644 (file)
@@ -200,20 +200,20 @@ activate_about (GSimpleAction *action,
   };
 
   gtk_show_about_dialog (GTK_WINDOW (window),
-                         "program-name", "GTK+ Code Demos",
-                         "version", g_strdup_printf ("%s,\nRunning against GTK+ %d.%d.%d",
+                         "program-name", "GTK Code Demos",
+                         "version", g_strdup_printf ("%s,\nRunning against GTK %d.%d.%d",
                                                      PACKAGE_VERSION,
                                                      gtk_get_major_version (),
                                                      gtk_get_minor_version (),
                                                      gtk_get_micro_version ()),
-                         "copyright", "(C) 1997-2013 The GTK+ Team",
+                         "copyright", "(C) 1997-2013 The GTK Team",
                          "license-type", GTK_LICENSE_LGPL_2_1,
                          "website", "http://www.gtk.org",
-                         "comments", "Program to demonstrate GTK+ functions.",
+                         "comments", "Program to demonstrate GTK functions.",
                          "authors", authors,
                          "documenters", documentors,
                          "logo-icon-name", "gtk4-demo",
-                         "title", "About GTK+ Code Demos",
+                         "title", "About GTK Code Demos",
                          NULL);
 }
 
index 99e85406671257fc4fc97aadf23630e0102df958..4c36010e7b22418796fef2f30895b0255c55dec7 100644 (file)
@@ -7,7 +7,7 @@
  * computers, as long as there is a network connection to the
  * computer where the application is running.
  *
- * Only some of the windowing systems where GTK+ runs have the
+ * Only some of the windowing systems where GTK runs have the
  * concept of multiple displays. (The X Window System is the
  * main example.) Other windowing systems can only handle one
  * keyboard and mouse, and combine all monitors into
index 8b5c2e0ce8a1aff12ae8ac5409b5f427f604728e..5ebdfd6a127737d2833222c8db2b5b4600aa2a50 100644 (file)
@@ -1,7 +1,7 @@
 /* Color Chooser
  *
  * A GtkColorChooser lets the user choose a color. There are several
- * implementations of the GtkColorChooser interface in GTK+. The
+ * implementations of the GtkColorChooser interface in GTK. The
  * GtkColorChooserDialog is a prebuilt dialog containing a
  * GtkColorChooserWidget.
  */
index 842696ea6163f3941c5fe91dccf3728fb7fe00a4..3f662fde76fa90adee61c6e83e9203bf75837353 100644 (file)
@@ -1,8 +1,8 @@
 /* Foreign drawing
  *
- * Many applications can't use GTK+ widgets, for a variety of reasons,
+ * Many applications can't use GTK widgets, for a variety of reasons,
  * but still want their user interface to appear integrated with the
- * rest of the desktop, and follow GTK+ themes. This demo shows how to
+ * rest of the desktop, and follow GTK themes. This demo shows how to
  * use GtkStyleContext and the gtk_render_ APIs to achieve this.
  *
  * Note that this is a very simple, non-interactive example.
index 88edbf4693de909a943b1aa11765d95f28096b02..c90de20f6d84361d8a7add52d6645b22a73e3fe9 100644 (file)
@@ -262,7 +262,7 @@ start_progressive_loading (GtkWidget *picture)
    * pauses in the reading process.
    */
   load_timeout = g_timeout_add (150, progressive_timeout, picture);
-  g_source_set_name_by_id (load_timeout, "[gtk+] progressive_timeout");
+  g_source_set_name_by_id (load_timeout, "[gtk] progressive_timeout");
 }
 
 static void
index ae6c62c4c8f5df6d83dc60e572af970b4d47a435..4e70c2f979e9ed965c978cc5d320910d5201a308 100644 (file)
@@ -361,7 +361,7 @@ do_listbox (GtkWidget *do_widget)
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
       gtk_container_add (GTK_CONTAINER (window), vbox);
-      label = gtk_label_new ("Messages from Gtk+ and friends");
+      label = gtk_label_new ("Messages from GTK and friends");
       gtk_container_add (GTK_CONTAINER (vbox), label);
       scrolled = gtk_scrolled_window_new (NULL, NULL);
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
index ba2f1a25c16ce3c36784e52c66a44d82fceff89c..c4ae6312a0bb1f81b181f2747bce393d97e7574b 100644 (file)
@@ -42,24 +42,24 @@ activate_about (GSimpleAction *action,
 {
   GtkApplication *app = user_data;
   const gchar *authors[] = {
-    "The GTK+ Team",
+    "The GTK Team",
     NULL
   };
 
   gtk_show_about_dialog (GTK_WINDOW (gtk_application_get_active_window (app)),
-                         "program-name", "GTK+ Demo",
-                         "version", g_strdup_printf ("%s,\nRunning against GTK+ %d.%d.%d",
+                         "program-name", "GTK Demo",
+                         "version", g_strdup_printf ("%s,\nRunning against GTK %d.%d.%d",
                                                      PACKAGE_VERSION,
                                                      gtk_get_major_version (),
                                                      gtk_get_minor_version (),
                                                      gtk_get_micro_version ()),
-                         "copyright", "(C) 1997-2013 The GTK+ Team",
+                         "copyright", "(C) 1997-2013 The GTK Team",
                          "license-type", GTK_LICENSE_LGPL_2_1,
                          "website", "http://www.gtk.org",
-                         "comments", "Program to demonstrate GTK+ widgets",
+                         "comments", "Program to demonstrate GTK widgets",
                          "authors", authors,
-                         "logo-icon-name", "gtk3-demo",
-                         "title", "About GTK+ Demo",
+                         "logo-icon-name", "gtk4-demo",
+                         "title", "About GTK Demo",
                          NULL);
 }
 
index bb4433d20f1667486c1d137329bd9719efc98fac..ca728143428d222ab16af55a1ec58d7206451398 100644 (file)
@@ -19,7 +19,7 @@
     <style><class name="devel"/></style>
     <property name="default-width">800</property>
     <property name="default-height">600</property>
-    <property name="title">GTK+ Demo</property>
+    <property name="title">GTK Demo</property>
     <signal name="destroy" handler="gtk_main_quit" swapped="no"/>
     <child type="titlebar">
       <object class="GtkHeaderBar" id="headerbar">
index 65902b74c3d8e2763a3e31b528fae1d853302a7b..7b142498bfe85cb26daeee2768c3635d2781e476 100644 (file)
@@ -3,12 +3,12 @@
   <id>org.gtk.Demo.desktop</id>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>LGPL-2.0+</project_license>
-  <name>GTK+ Demo</name>
-  <summary>Program to demonstrate GTK+ functions</summary>
+  <name>GTK Demo</name>
+  <summary>Program to demonstrate GTK functions</summary>
   <description>
     <p>
-      GTK+ Demo is a collection of examples that demonstrate the major
-      features of the GTK+ toolkit.
+      GTK Demo is a collection of examples that demonstrate the major
+      features of the GTK toolkit.
     </p>
   </description>
   <screenshots>
@@ -30,4 +30,4 @@
   <translation type="gettext">gtk-4.0</translation>
   <update_contact>matthias.clasen_at_gmail.com</update_contact>
   <developer_name>Matthias Clasen and others</developer_name>
-</component>
\ No newline at end of file
+</component>
index 3ccd28d6ab45e478260e60ef7057afaad1c728bd..021a92f710e350a7de59f0a211630bdfdba5fcf8 100644 (file)
@@ -1,6 +1,6 @@
 [Desktop Entry]
-Name=GTK+ Demo
-Comment=GTK+ code examples and demonstrations
+Name=GTK Demo
+Comment=GTK code examples and demonstrations
 Exec=gtk4-demo
 Icon=gtk4-demo
 Terminal=false
index de06f55ea07220abc7285751a9bf78c95dbc9d92..ce286cbcc9e16af1356c9f9361662b274e2a3131 100644 (file)
@@ -12,7 +12,7 @@
 #include <string.h>
 
 #define HEART "♥"
-const char text[] = "I ♥ GTK+";
+const char text[] = "I ♥ GTK";
 
 static void
 fancy_shape_renderer (cairo_t        *cr,
index d6a5cb011ee06968ef0f7fffc0d06cd1d223bdfd..5ec3d16fd055b563e59bec20467b8bc0d65551af 100644 (file)
@@ -19,7 +19,7 @@ do_sidebar (GtkWidget *do_widget)
   GtkWidget *widget;
   GtkWidget *header;
   const gchar* pages[] = {
-    "Welcome to GTK+",
+    "Welcome to GTK",
     "GtkStackSidebar Widget",
     "Automatic navigation",
     "Consistent appearance",
index 7da50295065c225b616e91484b7b3b0388cc013a..b1306a0ff3ea8263bb0d826c0cd7522af77407d9 100644 (file)
@@ -280,7 +280,7 @@ insert_text (GtkTextBuffer *buffer)
   gtk_text_buffer_insert (buffer, &iter,
       "This line (and most of the others in this buffer) is word-wrapped, "
       "using the proper Unicode algorithm. Word wrap should work in all "
-      "scripts and languages that GTK+ supports. Let's make this a long "
+      "scripts and languages that GTK supports. Let's make this a long "
       "paragraph to demonstrate: blah blah blah blah blah blah blah blah "
       "blah blah blah blah blah blah blah blah blah blah blah\n\n", -1);
 
index 5981a1edaaaf122adcd577afa13a78a2a72d0ce3..30e7f403da4ee5cb1c664ef6d68993a8f876522d 100644 (file)
@@ -1,10 +1,10 @@
 /* Theming/Style Classes
  *
- * GTK+ uses CSS for theming. Style classes can be associated
+ * GTK uses CSS for theming. Style classes can be associated
  * with widgets to inform the theme about intended rendering.
  *
  * This demo shows some common examples where theming features
- * of GTK+ are used for certain effects: primary toolbars,
+ * of GTK are used for certain effects: primary toolbars,
  * inline toolbars and linked buttons.
  */
 
index 2acbc798b03077f14f2625e1a332903906f41408..a780508aa2bf2220e0b9ba0410426c9087260e24 100644 (file)
@@ -3,11 +3,11 @@
   <id>org.gtk.WidgetFactory.desktop</id>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>LGPL-2.0+</project_license>
-  <name>GTK+ Widget Factory</name>
-  <summary>Program to demonstrate GTK+ functions</summary>
+  <name>GTK Widget Factory</name>
+  <summary>Program to demonstrate GTK functions</summary>
   <description>
     <p>
-      GTK+ Widget Factory is a showcase of GTK+ widgets. It was
+      GTK Widget Factory is a showcase of GTK widgets. It was
       originally created to help theme authors test their creations
       for completeness.
     </p>
index 685ebdc08fddda22b0874ad65eed60578c563afc..fa7218e593160d3841762308fd430273ed272263 100644 (file)
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Name=Widget Factory
-Comment=A showcase for GTK+ widgets, designed for testing themes.
+Comment=A showcase for GTK widgets, designed for testing themes.
 Exec=gtk4-widget-factory
 Icon=gtk4-widget-factory
 Terminal=false
index dc6a19016e48d96569f20284175b30dafcbbd7d2..e9cd3c3a7d1be84b6be17ae2ea0bdc8317485a95 100644 (file)
@@ -212,28 +212,28 @@ activate_about (GSimpleAction *action,
                           glib_major_version,
                           glib_minor_version,
                           glib_micro_version);
-  g_string_append_printf (s, "\tGTK+\t%d.%d.%d\n",
+  g_string_append_printf (s, "\tGTK\t%d.%d.%d\n",
                           gtk_get_major_version (),
                           gtk_get_minor_version (),
                           gtk_get_micro_version ());
   g_string_append_printf (s, "\nA link can apppear here: <http://www.gtk.org>");
 
-  version = g_strdup_printf ("%s\nRunning against GTK+ %d.%d.%d",
+  version = g_strdup_printf ("%s\nRunning against GTK %d.%d.%d",
                              PACKAGE_VERSION,
                              gtk_get_major_version (),
                              gtk_get_minor_version (),
                              gtk_get_micro_version ());
 
   gtk_show_about_dialog (GTK_WINDOW (gtk_application_get_active_window (app)),
-                         "program-name", "GTK+ Widget Factory",
+                         "program-name", "GTK Widget Factory",
                          "version", version,
-                         "copyright", "(C) 1997-2013 The GTK+ Team",
+                         "copyright", "(C) 1997-2013 The GTK Team",
                          "license-type", GTK_LICENSE_LGPL_2_1,
                          "website", "http://www.gtk.org",
-                         "comments", "Program to demonstrate GTK+ themes and widgets",
+                         "comments", "Program to demonstrate GTK themes and widgets",
                          "authors", authors,
                          "logo-icon-name", "gtk4-widget-factory",
-                         "title", "About GTK+ Widget Factory",
+                         "title", "About GTK Widget Factory",
                          "system-information", s->str,
                          NULL);
 
index 565e38d7ae10ffd57e653bef48e2788eb127963a..f9a1691101ab8ecb119423c1f3210c9638564395 100644 (file)
@@ -407,7 +407,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
   </object>
   <object class="GtkApplicationWindow" id="window">
     <style><class name="devel"/></style>
-    <property name="title">GTK+ Widget Factory</property>
+    <property name="title">GTK Widget Factory</property>
     <child type="titlebar">
       <object class="GtkHeaderBar" id="headerbar1">
         <property name="show-title-buttons">1</property>